add X11 to PLATFORM_LIBARIES when found#1166
Merged
cgutman merged 1 commit intoLizardByte:nightlyfrom Apr 12, 2023
Merged
Conversation
|
Your PR was set to |
9ced7fd to
a067da6
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Prior to #997 it appears that full X11 libraries were only needed as part of
FFMPEG_PLATFORM_LIBRARIES-- however, after this change, they are also needed outside the context of FFmpeg. This PR adds them toPLATFORM_LIBRARIESwhen found to satisfy this requirement.Believe this is not an issue currently because the requirement is handled by
FFMPEG_PLATFORM_LIBRARIES-- however it manifests as part of the nixpkgs packaging of Sunshine as we use FFmpeg from nixpkgs rather than the prebuilt version.Type of Change
.github/...)Checklist
Branch Updates
LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.